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