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