Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 19:17:42 PDT 2014