Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 02:35:39 PDT 2014