Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 14:43:40 PDT 2014