Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 01:57:41 PDT 2014