Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 16:56:46 PDT 2014