Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 00:08:38 PDT 2014