Re: #170 in assembla

Change-Id: Id289e8c30efa718c8e416faf9d7447729551e3b1
Merge branch 'php'