Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 13:33:36 PDT 2014