history-service

Merge lp://staging/~boiko/history-service/move_private_to_shared_lib into lp://staging/history-service

move_private_to_shared_lib
Merge into trunk

Proposed by Gustavo Pichorim Boiko on 2015-09-28

Status:	Merged
Approved by:	Tiago Salem Herrmann on 2015-10-08
Approved revision:	253
Merged at revision:	215
Proposed branch:	lp://staging/~boiko/history-service/move_private_to_shared_lib
Merge into:	lp://staging/history-service
Prerequisite:	lp://staging/~boiko/history-service/cached_contact_matching
Diff against target:	809 lines (+106/-93) 30 files modified CMakeLists.txt (+0/-1) Ubuntu/History/CMakeLists.txt (+0/-2) Ubuntu/History/historyeventmodel.cpp (+1/-1) Ubuntu/History/historymodel.cpp (+5/-5) cmake/modules/GenerateTest.cmake (+1/-1) daemon/CMakeLists.txt (+0/-2) daemon/historydaemon.cpp (+4/-4) historyprivate/CMakeLists.txt (+0/-22) plugins/sqlite/CMakeLists.txt (+1/-2) plugins/sqlite/schema/CMakeLists.txt (+1/-1) plugins/sqlite/sqlitedatabase.cpp (+2/-2) plugins/sqlite/sqlitehistoryplugin.cpp (+7/-7) src/CMakeLists.txt (+12/-4) src/channelobserver.cpp (+5/-0) src/channelobserver_p.h (+5/-0) src/contactmatcher.cpp (+9/-4) src/contactmatcher_p.h (+5/-0) src/phoneutils.cpp (+5/-0) src/phoneutils_p.h (+5/-0) src/telepathyhelper.cpp (+5/-0) src/telepathyhelper_p.h (+5/-0) tests/CMakeLists.txt (+0/-1) tests/common/CMakeLists.txt (+2/-2) tests/common/telepathytest.cpp (+2/-2) tests/daemon/CMakeLists.txt (+0/-1) tests/daemon/DaemonTest.cpp (+3/-3) tests/historyprivate/CMakeLists.txt (+0/-12) tests/libhistoryservice/CMakeLists.txt (+7/-0) tests/libhistoryservice/ContactMatcherTest.cpp (+12/-12) tests/libhistoryservice/PhoneUtilsTest.cpp (+2/-2)
To merge this branch:	bzr merge lp://staging/~boiko/history-service/move_private_to_shared_lib
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2015-09-28	Approve on 2015-10-08
PS Jenkins bot	continuous-integration		Approve on 2015-10-08
Review via email: mp+272608@code.staging.launchpad.net

Commit message

Move the classes from historyprivate static library to libhistoryservice itself and just keep their header files private.

Description of the change

Move the classes from historyprivate static library to libhistoryservice itself and just keep their header files private.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-28:

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/history-service-ci/247/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/86
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/247/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-09-28

229. By Gustavo Pichorim Boiko on 2015-09-28: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-28:

PASSED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/history-service-ci/251/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/89

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/251/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-09-28

230. By Gustavo Pichorim Boiko on 2015-09-28: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-28:

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/history-service-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/91

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/253/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-09-28

231. By Gustavo Pichorim Boiko on 2015-09-28: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-28:

PASSED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/history-service-ci/257/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/95

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/257/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-09-29

232. By Gustavo Pichorim Boiko on 2015-09-29: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-29:

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/history-service-ci/261/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/99

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/261/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-09-30

233. By Gustavo Pichorim Boiko on 2015-09-30: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/history-service-ci/266/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/104

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/266/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-09-30

234. By Gustavo Pichorim Boiko on 2015-09-30: Merge parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

PASSED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/history-service-ci/268/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/106

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/268/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-09-30

235. By Gustavo Pichorim Boiko on 2015-09-30: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

PASSED: Continuous integration, rev:235
http://jenkins.qa.ubuntu.com/job/history-service-ci/271/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/109

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/271/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-01

236. By Gustavo Pichorim Boiko on 2015-10-01: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01:

PASSED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/history-service-ci/275/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/113

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/275/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-01

237. By Gustavo Pichorim Boiko on 2015-10-01: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01:

PASSED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/history-service-ci/278/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/117
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/117/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/116

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/278/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-01

238. By Gustavo Pichorim Boiko on 2015-10-01: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01:

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/history-service-ci/279/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/117

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/279/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-02

239. By Gustavo Pichorim Boiko on 2015-10-02: Merge latest changes from parent.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-02:

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/history-service-ci/282/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/120

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/282/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-02

240. By Gustavo Pichorim Boiko on 2015-10-02: Merge latest changes from parent.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-02:

PASSED: Continuous integration, rev:240
http://jenkins.qa.ubuntu.com/job/history-service-ci/287/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/126
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/125

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/287/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-02

241. By Gustavo Pichorim Boiko on 2015-10-02: Merge parent branch.
242. By Gustavo Pichorim Boiko on 2015-10-02: Merge parent branch

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-02:

PASSED: Continuous integration, rev:242
http://jenkins.qa.ubuntu.com/job/history-service-ci/290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/128

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/290/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-02

243. By Gustavo Pichorim Boiko on 2015-10-02: Merge parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-02:

PASSED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/history-service-ci/293/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/131

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/293/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-05

244. By Gustavo Pichorim Boiko on 2015-10-05: Merge parent branch.
245. By Gustavo Pichorim Boiko on 2015-10-05: Merge changes from parent.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-05:

PASSED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/history-service-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/134
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/133

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/295/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-05:

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/history-service-ci/298/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/137
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/136

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/298/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-06

246. By Gustavo Pichorim Boiko on 2015-10-06: Move TelepathyHelper to the History namespace.
247. By Gustavo Pichorim Boiko on 2015-10-06: Move PhoneUtils to History namespace.
248. By Gustavo Pichorim Boiko on 2015-10-06: Move ContactMatcher to History namespace.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-06:

PASSED: Continuous integration, rev:248
http://jenkins.qa.ubuntu.com/job/history-service-ci/301/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/140
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/139

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/301/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-06

249. By Gustavo Pichorim Boiko on 2015-10-06: Move ChannelObserver to History namespace.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-06:

PASSED: Continuous integration, rev:249
http://jenkins.qa.ubuntu.com/job/history-service-ci/302/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/140

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/302/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-07

250. By Gustavo Pichorim Boiko on 2015-10-07: Merge latest changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-07:

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/history-service-ci/303/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/141

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/303/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-07

251. By Gustavo Pichorim Boiko on 2015-10-07: Merge changes from parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-07:

PASSED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/history-service-ci/305/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/144
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/305/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/move_private_to_shared_lib updated on 2015-10-08

252. By Gustavo Pichorim Boiko on 2015-10-08: Merge latest changes from parent branch.
253. By Gustavo Pichorim Boiko on 2015-10-08: Merge latest changes from parent.