Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 14:08:37 PDT 2014