Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 19 08:23:56 PDT 2014