GCI commits

8 out of the 10 commits were merged in the "staging_done" branch, the last two commits are not merged but were reviewed.
I thought they were merged to the staging branch at first time, but anyways so here are all the commits and please the review the last commit -  9716d22 , which is for my task - https://www.google-melange.com/gci/task/view/google/gci2014/6426425783484416